From: Paul Eggert <eggert@cs.ucla.edu>
Date: Fri, 28 Jan 2011 00:10:20 +0000 (-0800)
Subject: Merge from mainline.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~4685^2~93
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=0cee7cee6e91f0cdeebb2e5711287262c7f6c7ec;p=emacs.git

Merge from mainline.
---

0cee7cee6e91f0cdeebb2e5711287262c7f6c7ec